js: Avoid Clutter.get_current_event() in Clutter.Actor event vfuncs

We sometimes obtained the current event through the general machinery
just so we could pass it along as a ClutterEvent instead of a specialized
subtype.

We now get that out of the box, so may avoid getting the current event
which is just a cast of the same current event we already have.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2872>

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 18e1f34e7cad409bb0d3192d82c3c7ee237995ba..df32fcca564d0eb2b3a574437eff1adb4bccd862 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -111,8 +111,8 @@ export const ModalDialog = GObject.registerClass({
         this.notify('state');
     }
 
-    vfunc_key_press_event() {
-        if (global.focus_manager.navigate_from_event(Clutter.get_current_event()))
+    vfunc_key_press_event(event) {
+        if (global.focus_manager.navigate_from_event(event))
             return Clutter.EVENT_STOP;
 
         return Clutter.EVENT_PROPAGATE;

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index f22e04c21cfc6f44f30d0cbb88b29b8e75730ce3..c15b74c3dbda036d64ccce8ce0f76ccf76b1970c 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -143,7 +143,7 @@ export const PopupBaseMenuItem = GObject.registerClass({
     }
 
     vfunc_key_press_event(event) {
-        if (global.focus_manager.navigate_from_event(Clutter.get_current_event()))
+        if (global.focus_manager.navigate_from_event(event))
             return Clutter.EVENT_STOP;
 
         if (!this._activatable)
@@ -162,7 +162,7 @@ export const PopupBaseMenuItem = GObject.registerClass({
 
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
-            this.activate(Clutter.get_current_event());
+            this.activate(event);
             return Clutter.EVENT_STOP;
         }
         return Clutter.EVENT_PROPAGATE;

diff --git a/js/ui/slider.js b/js/ui/slider.js
index 7ca0e3fef7052e02f997bc7cd1a5709ea0290bbb..cde2ebce345a64af877adf60f8566dedd2d39399 100644 (file)
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -61,8 +61,8 @@ export const Slider = GObject.registerClass({
         cr.$dispose();
     }
 
-    vfunc_button_press_event() {
-        return this.startDragging(Clutter.get_current_event());
+    vfunc_button_press_event(event) {
+        return this.startDragging(event);
     }
 
     startDragging(event) {
@@ -117,8 +117,7 @@ export const Slider = GObject.registerClass({
         return Clutter.EVENT_PROPAGATE;
     }
 
-    vfunc_touch_event() {
-        let event = Clutter.get_current_event();
+    vfunc_touch_event(event) {
         let sequence = event.get_event_sequence();
 
         if (!this._dragging &&
@@ -159,13 +158,13 @@ export const Slider = GObject.registerClass({
         return Clutter.EVENT_STOP;
     }
 
-    vfunc_scroll_event() {
-        return this.scroll(Clutter.get_current_event());
+    vfunc_scroll_event(event) {
+        return this.scroll(event);
     }
 
-    vfunc_motion_event() {
+    vfunc_motion_event(event) {
         if (this._dragging && !this._grabbedSequence)
-            return this._motionEvent(this, Clutter.get_current_event());
+            return this._motionEvent(this, event);
 
         return Clutter.EVENT_PROPAGATE;
     }